bitkeeper revision 1.1041.1.14 (40eaf438sciOdZWe5QAqcjLLtbzF2Q)

Minor PCI tweaks to move ever so slightly toward 2.6 and make ia64
(based on 2.6) easier.

diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c
index 258d9d8c8ae0bc965c3cfbea2cdc04f8a756bcff..f8697d13376ec925fd1bb6b9370fcc6c07cf8704 100644 (file)
--- a/xen/drivers/pci/pci.c
+++ b/xen/drivers/pci/pci.c
@@ -890,7 +890,7 @@ pci_set_mwi(struct pci_dev *dev)
        u16 cmd;
 
 #ifdef HAVE_ARCH_PCI_MWI
-       rc = pcibios_set_mwi(dev);
+       rc = pcibios_prep_mwi(dev);
 #else
        rc = pci_generic_prep_mwi(dev);
 #endif
@@ -1384,7 +1384,7 @@ struct pci_dev * __devinit pci_scan_slot(struct pci_dev *temp)
                temp->hdr_type = hdr_type & 0x7f;
 
                dev = pci_scan_device(temp);
-               if (!pcibios_scan_all_fns() && func == 0) {
+               if (!pcibios_scan_all_fns(0,0) && func == 0) {
                        if (!dev)
                                break;
                } else {

diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h
index 1a217315a42473a18e97bbe6de5ddedb9e0dbfc2..c5f72c0faec6669e8cc75617a13d1374ece51c3c 100644 (file)
--- a/xen/include/asm-x86/pci.h
+++ b/xen/include/asm-x86/pci.h
@@ -12,7 +12,7 @@ extern unsigned int pcibios_assign_all_busses(void);
 #else
 #define pcibios_assign_all_busses()    0
 #endif
-#define pcibios_scan_all_fns()         0
+#define pcibios_scan_all_fns(a,b)      0
 
 extern unsigned long pci_mem_start;
 #define PCIBIOS_MIN_IO         0x1000

diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index f4d9d72f9c33281ebacd78e1a6ecd2552b15eb2a..90fce051b1f4f9bbc4e2aaa70d9b3ba3875df5af 100644 (file)
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -393,6 +393,10 @@ struct pci_dev {
                                           this is D0-D3, D0 being fully functional,
                                           and D3 being off. */
 
+#ifdef LINUX_2_6
+       struct device dev;              /* Generic device interface */
+#endif
+
        /* device is compatible with these IDs */
        unsigned short vendor_compatible[DEVICE_COUNT_COMPATIBLE];
        unsigned short device_compatible[DEVICE_COUNT_COMPATIBLE];